Remove TODO's for ActionBar