remove crap, add master clock