either way we'll be removing them as we add functionality - so I don't see the need for the extra define
but since you'll likely be the one continuing to get the various functionalities working, go with what feels right you to