Removed baubles api and added @Optional interfeces so it doesn't crash if baubles fails to download