Remove rather than comment?