took out some random cruft