Final cleaning up