Feature/chatmanager

remove commented out code