refactor and deletion of unneeded stuff

Signed-off-by: unknown <boris@boris-PC2.gspaces.com>