*Fixed some naming Issues confighandler and custom add/remove
- Removed Unused old functions