Tidy up - delete all commented out code