Clean up some whitespace, unneeded delete statements