Remove commented out code since it will not be used anymore