Removing obsolete macros, changes to work with the trunk, clean-up