Trying to get rid of potential security holes