took out useless stuff