removed unused property, cleanup