final touches to fully remove data and replace with API