Dev Ubuntu support and cleanup