Removed some obsolete code. Fixed tool-development.sh