Current way was expecting return values that are not present in slaves

Comments, trailing spaces, dead code

- No need of so much debug
- remove dead code
- Indent