Began some clean up -- espically when users are logged in that aren't managers.
Far from done, but got a start.