Fix property name
Remove useless code