Removed profiler & cleaned aliases