remove fixtures & some cleanup