Feature/image view

Remove commented out code.