removing old commented out code, and slightly improving the delete for columns