Trimming

removed a good chunk of excess stuff not connected to this.
Revert "Trimming"

This reverts commit 2a7bb855ef980d2ff4dca99f32f5cbbd1dc9f0c4.
Revert "Revert "Trimming""

This reverts commit e823a36bf02e853d8629eceb7a3a59a1daed592f.