Remove commented, unused code