removed useless things and housekeeping2

Signed-off-by: fabio <fbi.gritti@gmail.com>