Now my solution is not for everyone, we swaddled both DDs really late, so this time with DD2 she was over 7 months and it was getting silly, she needed the swaddle to sleep but she also broke out of it in the night.
We just did it cold turkey, half-swaddle did not work for us, we also timed it with sleep training, so one night we just put her in the gro-bag and to bed, we did controlled crying - in and out every 5/10/15 mins etc, going in more than this if she was loosing it.
The first night it took her 3 hrs to get to sleep, a lot of this was whinging on and off not full on crying, but since then she has been fine and sleeping so much better - I didn't want to attempt sleep training until she could self-sooth on her hands as it felt really mean. We also gave her a little blankie to cuddle.
I know this method is not for everyone but before I think I was just confusing her trying to shush/pat, rock her/ sit in her room/feed her etc. We never had a clear method for helping her to sleep.
Now she is sleeping 6.45-10.30pm (dream feed) then 10.45-7.30am (if she wakes in the night I have only had to go in once or twice to check on her) and she knows how to get back to sleep now.
We also cut up the swaddle so we would not be tempted to use it!
Her naps got shorter to start with so we went back to three short naps a day, but now they are getting longer again.
I dreaded getting rid of the swaddle but I am so relived we have done it now.
Just put up with one or two bad nights and then you will be done :)
Good luck!