Remove debug code :p