removing common stuff...
More separation