Tweaks for rsss aio
Removed done TODO's