Removing type resolution for now