Cleanup again
Cleanup and security update