Update configuration and clean up partial implementations
Stage changes for conversion