general cleanup around data controllers