Issue refs #1417: remove affix and related code