@since and clean up for 52ae5fe35a2e56a75fce10d57e2a01c3cb89f482