Cleaned up errors from getting rid of Drawable class