Remove inject/cleanup and fix timeout.