remove config and clean code