- fix return type
- remove local fields (not used)