Remove Configuration class and minor cleanup