Cleanup uncommented code