* Basic clean up of old and/or duplicated properties