clean branch for use with legacy code