An apparatus for detecting and removing moisture and contaminants from fuel stored in a tank includes optical fiber for examining the fuel for moisture and contaminants, a light source and a lens; a suction hose insertable into the tank; a pump connected to the suction hose, a waste holding container for receiving moisture and contaminants; a contaminant filter connected to the return hose; and a valve between the pump outlet, the waste holding container and the contaminant filter inlet.