Simplify/Cleanup some code

Change-Id: Idb9df2ead44522a35a5095678d9e96cc41a0b196
Fix "Fit in View" action wrt latest changes

Change-Id: I773632c519c4e496a8bfc8b962baa91cffe90fba
Fix warning: Remove unused method

Change-Id: I99223435cc6471f25b9ef9ea9241c2b3b54bdecb