BUG: Fix optimization for full_output = False
STY: Clean up commented out code