cleanup for Drawable.h