Remove debug, revert testing code