Removing mangle context for now