Remove unnecessary code tasks and clean couple bits in the code.