Removed unnecessary space-area-related code

Who says TODO's never get done?