cleanup
re-added typed manager wrapper