Remove handling of outdated macro's