obsolete and unused code removed