Remove obsolete code.
Cleaning-up script names.