clean up un-needed code