Code clean up, removed unwanted enums and configurations

Revision:
66:cc7069bc0ead
Parent:
32:52445bef314d