Remove obsoleted functions