Clean-up

Get rid of all commented code