Revert "Added stripping of square brackets to cleanup_value"

This reverts commit 9c739488b12345f8b7baca228230da7dbf10e6ed.