Removing the flip-flops