Removed reference to no longer used image
Code cleaning and refactoring