cleanup code
6.46.3