Tidy up: got rid of commented out declarations