PROSODY-51 more clean-ups