Got rid of some useless commented out functions.