Remove commented crap, update version