Remove WhisperPush
Reorder and comment excludes
Add custom Trebuchet