Removed unwanted enums and unused functions

Revision:
64:d89d9728ba95
Parent:
31:8ab5d9a29a9f