Better approach to removing old sensors

[bpbond]

In #35 I did a quick hack to remove obsolete sensors, but we'll want to come back to this later and implement a cleaner, better solution.