remove old, refactor