Revert "shorthand added to clean markup"

This reverts commit 809d372eb8c7eb9a7db6d9e3004dd4e6f1852f25.