Decided Some stuff was not necessary