remove commented code
Remove complexity