Removed unwanted enums and unused functions

Revision:
64:d89d9728ba95
Parent:
24:2d2cb6ac71fd