Mild code cleanup

Fixed a few warnings, took out some uneeded code.