Some cleanup while I'm trying to figure out what the hell is wrong with S_star