cleaning and backward compatibility