Remove init-script and added sort