Redid some scripts, removed old ones