Remove this from the code and make this a separate issue so that there can be a discussion thread around it.