Remove stuff that's not used