Remove unused code
Rename property for consistency with conventions