clean up: remove more unused code