Revert "Brandon work branch"

This reverts commit fc7f4a75a9f2b400baeec1caf1290479c13ae74a.