Removed some old commenting