Remove the obsolete replacement for now