Clearup for code correct setup now