Clean up
More clean up