deprecated common.class, revised performance... (clean up/tidy up)