remove seemingly unnecessary code