(I feel like I commented on this code elsewhere)

Needed, if commented out anyway?