Took out useless stuff