rm unused config
distract message listener
refactor