removed a few commented out bits of code