image handling classes cleaned up