Removing debug code, sorry