more security cleanups