took out commentedout code