Clean FK/Moonshot code