better remove than comment