Further code cleanse.

removing 'safety' comments....