Cleanup please.

Cleanup please.

3