Cleaning up setup page [#62059530]