Some clean up…