Remove unused code
Add some config
Added simple message manipulation