undoing some stupidities...