work towards feature removal