Squashed cleanup