ecb?() doesn't work yet. Just some cleanup otherwise.