AS7-6120 Clean out cruft