Remove hardcoded length value