clean up, add concerns
clean up