Removing some cruft I don't intend to use.