Update Scripts, Cleanup