Start to cleanup old tools
Merge pull request #984 from achamely/dbstaging

Start to cleanup old tools