Revert "Working on image support"

This reverts commit cdcfe08a883eec78f86b7abe7066170016f5cbec.