Remove diagnostics, attempt to work with sh