Removed commented-out properties from model