Fix build problems (eclipse) and remove unused code.

Signed-off-by: Tzachi Dar <tzachi.dar@gmail.com>