Cleanup and update some scripts