Cleaned up tradition

Got rid of the redundant code and the commented out sections.