Revert "Need to be able to remove instrument"

This reverts commit 0effef82e7ed8b28a91f765fdb20db5a1ea7941e.