Armen cleanup

-  [ ] I ran the specs
-  [ ] I think the commit messages here communicate intention