Revert "I&A Safety"

This reverts commit c9d922591c04ae932f9b4b512b3cd13d560e4b9e.