Revert "WIP: Tasks"

Created by: marcus-oscarsson

Sorry I was a bit to fast when merging this one, please apply the fixes and we will be happy to accept it.