Cleaned up some scripts