[refs #111] Remove redundant code
Merge branch 'feature/images'