Clean up commit

Unused variables, classes, object etc are removed.

Couple of classes are relocated to another package

Signed-off-by: Virgil <virgil@mobilepioneers.com>