Some unused stuff removed