Wow really, updated settings and removed cruft