Actionbarsherlock cleanups