removed unnecessary property, cleanup