taking stuff out.. about to start somewhat large scale refactor... now seems like a decent time since I'm working in c concurrently and have a sense of the way things should be for both languages