Clean up
Finish clean up