Are we leaving these commented out for deprecation purposes (as opposed to just deleting them)? And if so, do we need to create an issue to go back and make sure they are removed after a specified amount of time?