Removed some old comments and an old dead function that can be confusing