Continued cleanup