remove more hacky stuff