Removing old code. Uncommenting debug code.