* big cleanup
* refactor API
* delete unused resources
