Removed dependancy on uncommited class Image