Updates to code to remove crap