cleanup fixes