A little more on security and cleanup