MOGAMI: CleanUp and Optimizations

Change-Id: I6b24d4726935dba76f8d1a6b5db5ceb8abf2af5a