Remove common. Is not needed anymore