Some clean up of weight learning classes.