remove tools
minor cleanups