plug gush and clean up

                   
|Q            |A  |
|---          |---|
|Bug Fix?     |no |
|New Feature? |no |
|BC Breaks?   |no |
|Deprecations?|no |
|Tests Pass?  |no |
|Fixed Tickets|   |
|License      |MIT|
                   


 Sent using [Gush](https://github.com/gushphp/gush)
Keep these without the ending comma, and switch others as you see them