Martin Morgan remove unused code, re-organize qureries