moving everything out of common