@mennaamr remove commented code