Removed even more unused code