Let's remove this commented out code until it implemented in #139.