rhbz988202 Remove obsolete code