Remove stuff we don't yet use