Fix circular import and remove no longer needed Markup()