small cleanup after moving to android studio 1.0