General cleanup with some manager getters removed