Cleanup

Change-Id: I704aeab0fcbef06596a0bb920be288b214b1e892
Signed-off-by: Tobias <pahlings@gmail.com>