more cleanup after messy merge