remove commented code and enable brace completion
Merge pull request #1823 from diegosarmentero/master

remove commented code and enable brace completion