Split up code for cleanup.