Code

Remove macros which are only used for default option values