remove deprecated comments and keywords