Revert "Added toolgun and working Q-menu"

This reverts commit 7f1ca8be694fb693fa814bf9ad07c7bb33e9ab27.
Readded includes

Also made SQL errors produce a trace.