Removed plain-text parsing