Ashish|#122|Cleaning up properties