Removes unused comments.
Updates test to reflect changed dependencies.