Mostly clean up