Remove deprecated observers and replace with callbacks