removed unused enums
removed useless properties