Further uncluttering