Refactor-removing old package