removed some uneeded old code and unneeded whitespace