Remove doctrine compilation. Useless and not used therefore.
Implement macro expander

refs #1882
Merge branch 'feature/macro-expander-1882' into next

resolves #1882