Cleanup unused code

There were still some boiler plate functions left that we weren't using,
so they have been removed to help keep the codebase cleaner.