cleaning up some whitespace and remove dead code