Remove unused code & add missing property declaration