cleanup code (2)