Cleaning up some security concerns.