more unused code removed