Revert "Added additional options for markup control"

This reverts commit 7cbbead7a20a03da231a6983d95464eb1a2a85fb.