Moved code into contaminant manager