cleanup Q004