refactor old rubbies