remove commented code and debug