Removing handling of properties