Remove old code, move things around.