Added some useless commented out code