Corrected a bug that caused tasks not being marked to execution
Deleted some files
Merged files