Clean up imports
Added a TODO for setting the bucket lifecycle.