Removed unnecessary uses of support library

Closes #16.