Added another clock and cleaned unused code.