Remove more properties that are never used