Toning down the debug and removing old code.