Overlord fix and unused code removal