Removed dependency on a couple of smallpicture utility files