Remove irrelevant code, more clean up.