Cleaning
Property attribute cleanup