Code clean up, removed unwanted enums and configurations

unknown revision 'e4e3cd73fc5f'