Feature/remove observer

done