Removed duplicates, cleaned up some scripts