Remove Unused classes, if statement for empty inputs for addtask