removing image, bumping to 2.0, code cleanup, removing image relience