Drop obsolete method, cleanup comment