Code clean up, removed unwanted enums and configurations

shortlog@f5f553b8c0d5: not found in manifest