Code

Added remove template and some checks to tasks