Adjusted line endings in a few files. Removed dead code