Revert "Settings UI ready" due to it's going to be in a separate branch.

This reverts commit 17a45c11097db077671fd798d0ad6d138d0aa583.