Remove debugging, simplify