Clean up more unused stuff