Getting rid of some cruft