drop obsolete return stmt, drop disabled code