Removed profiling variables and unused enums