Removed duplicates, fixed ordering of scripts