Data space overflow fix
Fix for battery consumption. Cleanup