Removed unwanted enums and unused functions

Revision:
64:d89d9728ba95
Parent:
63:6d048b2f3f32