Same problem, two clicks per crank revolution. Checked everthing, no luck. Later I removed the adheadset headset just to clean and relube. The freaking headset was clicking in response to my pedaling....yet the sound came from the bottom bracket...honest...good luck