cleanup code 2