Cleanup unused code in observable() add some comments