Add new scripts and cleanup