Cleaned up some interface references
Merge pull request #121 from ddebree/cleanup_interfaces

* cleanup_interfaces:
  Cleaned up some interface references