Remove the default tab mechanism. Refactoring