Refactor/cleanup remove old