Clean up removing any warnings, added proper discovery of security package