stripping out more unused code