removed some more unused code