Cleanup miscellaneous clutter