Clean up of usecase