Remove stuff not necessary