begin removing unnecessary code