Removal of stuff

prep for TS work and full integration Adrian sux and q query account approval