Removed bucket references