clean up unneeded data paths