Refactoring session
Removed unused property