Further cleaning of scripts