Cleanup tasks

* completed some simple tasks
* degrade some others
* remove some oboslete ones