Deleted leftover code from issue 1559