Production staging

Finished cleanup, will continue to develop background data collection in a new branch