Cleaned up unneeded comments in core