Cleanup

* remove already implemented tasks
* rename variable