Remove unused (and non-functioning) code