Cleanup: Remove unused methods/classes

Note, if you make improvements please remove the methods that are no
longer being utilized. This is just for clarity's sake, otherwise we
will have a harder time reading the code.