removed all the pointless old code
cleaned up code
more code cleaning