Remove unnecessary observable wrapping logic