Get rid of commons collections