Remove DS, Version compare and JoomFish code