lot of cleanup in jingle part