Remove whitespace/old code