more cleanup and commenting out until we can add in relevant pieces