Removed SC specific stuff