remove refs to common