cleanup and group backward compatibility methods