- kept working on config file
- removed few misc cleanup functions