Refactor Delete Framework Code