Remove Image field dependency