Remove obsolete remove* methods