Getting rid of more debugging statements and old code that didn't work