More unused stuff removed