Removing unused scripts.
Minor tweaks
Remove logging.