Broker spellcheck

Fixed broker spelling and removed unused classes