more elroy cleanup