Bracket raw

Remove workarounds for irc-factory fixed issue.