- clean up the shameful clk_enable error correction introduced in v6
 - clean up the code