Removed more debug code (it's sunday...)