Cleaning up helper scripts