Clean up
* Cleaned up after merging v3 into branch

Signed-off-by: marcelr <marcelrienks@gmail.com>