Cleanup

remove unused properties