Add the proper role for anonymous.

Little bit of clean up as well... Removing some commented-out code.