Removed leftovers from the split-up from Starbits.