Clean up uncommented code