removed json, regex cleanup