Removing trail requirement from Drawable, removing Block and converting those to Drawable