Remove leftovers, refactor.