Use QB
code cleanup
more cleanup