PRD-4746, PRD-4747 - Code Cleanup