removed misleading and unused code