Some final touches to the cleanup script for closing off #18