prepare for versions:update
Cleaning up resources
Minor fixes