Code clean up, removed unwanted enums and configurations

Revision:
66:cc7069bc0ead
Parent:
59:3d395512b442