Fixes botcall conflicts, removes even more cruft and unused code