revert incorrect schema additions
extract hack to test config ony