Clean up unused cruft