To add to what Jun said, you can also "watch" your .xql files so that you do not have to restart aolserver to have your subsequent changes reloaded (usually .xql files are loaded only on startup). Go to "manage file information" in APM.
Removing queries from the tcl code, I think, is good practice.
