Removed some more unused code