fixed bug, removed unused properties