removing debug logs
merging latest changes