Not related to this change, should be removed from pull request