Refactor - Remove no longer needed code