Cleanup part 6

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