Remove non-functioning code