diff --git a/card10-cross.ini b/card10-cross.ini
index 805a38670fbce8ba8ce6b85adc0ccc4db6790fe7..d0a5d9210b40e7200e001759796504556d09f25b 100644
--- a/card10-cross.ini
+++ b/card10-cross.ini
@@ -4,9 +4,8 @@ ar = 'arm-none-eabi-ar'
 strip = 'arm-none-eabi-strip'
 
 [properties]
-# TODO: Switch to hard float
-c_args      = ['-mthumb', '-mcpu=cortex-m4', '-mfloat-abi=hard', '-mfpu=fpv4-sp-d16', '-Wa,-mimplicit-it=thumb', '-ffunction-sections', '-fdata-sections', '-fsingle-precision-constant', '-fno-isolate-erroneous-paths-dereference']
-c_link_args = ['-mthumb', '-mcpu=cortex-m4', '-mfloat-abi=hard', '-mfpu=fpv4-sp-d16']
+c_args      = ['-mthumb', '-mcpu=cortex-m4', '-mfloat-abi=hard', '-mfpu=fpv4-sp-d16', '-Wa,-mimplicit-it=thumb', '-ffunction-sections', '-fdata-sections', '-fsingle-precision-constant', '-fno-isolate-erroneous-paths-dereference', '-Wl,--start-group', '-lc', '-lnosys', '-Wl,--end-group']
+c_link_args = ['-mthumb', '-mcpu=cortex-m4', '-mfloat-abi=hard', '-mfpu=fpv4-sp-d16', '-Wl,--start-group', '-lc', '-lnosys', '-Wl,--end-group']
 
 target_defs = ['-DTARGET=32665', '-DTARGET_REV=0x4131', '-DBOARD_CARD10=1']
 
diff --git a/pycardium/mphalport.c b/pycardium/mphalport.c
index 336ccce2b4e0b290936fd4d031dbd9f4895b9772..5694f47a65544ae68791595f371afd0cc56643cf 100644
--- a/pycardium/mphalport.c
+++ b/pycardium/mphalport.c
@@ -65,22 +65,3 @@ mp_obj_t mp_builtin_open(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs)
 	return mp_const_none;
 }
 MP_DEFINE_CONST_FUN_OBJ_KW(mp_builtin_open_obj, 1, mp_builtin_open);
-
-/******************************************************************************
- * TODO: Remove
- */
-
-int _getpid(void)
-{
-	return -1;
-}
-
-int _kill(int pid, int f)
-{
-	return -1;
-}
-
-void _exit(int r)
-{
-	;
-}