Getting ready for setup page, removed fixed todo