Remove configuration
Major CFG refactor
Test CFG handler