Remove unused code

Some of the boiler plate functions were still around. Clean those out
to make things easier to read.