Removing the dependency on NYXImagesKit and some code cleanup.