Tidy up and mark deprecated observers
Remove unused function