Clean up things
More clean up