IOCUS-21 - Cleanup for Ubunutu release