Finished moving junk to c_model based SWEP