Unecessary macros removed from example files