Fix masked local, remove commented code