DEV-23 trim all the things