remove some cruft and rename some things