Got rid of some more officer stuff in the code. The only remaining officer stuff is in the budget_queries file
recommit with the same comment as the last one