Making application more stateless
Cleanup