Remove pre-EAK stuff