remove unused (bug-producing) code, comment non-implemented