Minar-fixes. Removed debug-return stmt