fixed return type for values which are not needed.
Merge branch 'spesmilo/master', remove compile guards.