cleanup stuff that shouldn't be there (#4035)