Additional security related updates and cleanup