[ModernForum]

General cleanup