Cleanup, getting rid of everything unnecessary