removed unused classes, removed deprected @Autowired, added MessageEventProducer