Remove comments and unused variable
Move config variables into own YAML file