clean up - second part