remove some gross code