Removed some more unused stuff