remove unused defines, introduce some new ones, and generally cleanup.
Attach a file by drag & drop or click to upload
