Cleanup part 2

Signed-off-by: Michael Bestas <mikeioannina@gmail.com>

Change-Id: Iafe312a9ee77f7f10e5e750571c9d210ad23055f