remove micro-container usage
Merge pull request #1809 from andytaylor/master

remove micro-container usage