Gt/clean up request pt 1

This is a pretty crappy pass, but it's a step in the right direction.