Remove debugging things. Fix broken specs.