Bruton cleanup

Clean it up