Remove old code after introducing the ActionBar