Fix property lookup and remove commented code