remove unused properties
split add() method