Remove no longer functional code