Clean up, should test apply instead of extract