Drawable/View api cleanup