Security clean up