Removed the debug; it should all work now, so there's very little reason to have it split up like that.