Remove uneeded task & update build process