cleaned up a lot of cruft I don't really use anymore