extraction cleaned up