Clean up unused code move actionbar menu to generic menu xml