Clean up?

Completed