changed config to make some sense
cleanup