remove some definitions and declarations that are no longer used.
Attach a file by drag & drop or click to upload
