Refactor out old user specs