cleaning up so much cruft