Remove stuff not used