CM: Fix Config
CM: Remove unused jars
DEV: Refactoring
DEV: Refactoring
DEV: Refactoring
DEV: Refactoring