Feature/cleanup hooks