Remove common models from extension classes