Cleaned up responsibility