Removing the extra schema