Cleanup of old and irrelevant comments