more fixes removing debug code and compatibility
Merge branch 'mmqe' of https://github.com/dhadfieldmenell/lfd into mmqe