Clean up some comments and dead code