Removing references to debug