Eliminated lambda, undo debug compialtion changes