Removed Unnecessary Properties