remove code from other bug