Cleaned up image package
Merge branch 'image-cleanup'