Fixed and tested

Wooo! It works! (removes contamination though)