Cleaned up clutter