Updated commentary and removed a redundant method that was left over
from the merge.