Refactoring, removed unused code

Signed-off-by: Dominik Schadow <dominikschadow@googlemail.com>