Add demonstration for how to listen to changes and remove orphan code