Remove methods now in core