Added comments, deleted dead code

For my own sanity. A couple functions that were out of use/useless were
deleted.