Drop now unused macros
update git ignore
test tied scalars