Removed/ignored more unused stuff.