Revert unneeded misc changes made for bot code