remoing some cruft