Cleaned up directives for resident, apartment and parkingspot.