Tests pass. Subbuckets and listing working
Remove extra files
Final cleanup