workaround for weird sdk version bug
removed messages and unused imports
renamed misc entities
fixed bug #5