Tidy up - delete commented out code