Remove all the commented old code, no reason for it