cleanup from old changes