took out some more stuff