Remove tasks stuff and fix parameterized interface issues