Can you please remove commented code? As it seems that you don't need it.