Small fixes - unused stuff removed