Mockups deleted, class-picker added, choose server not ready