Mainly code cleanup ...

- minor update (error checking) in check_incoming
- removed unused codes, info
- updated info