clean up Configuration implementation