Add autoload tasks, remove unnecessary tasks