more cleanup
test platform specific function implementation
test
cleanup

more cleanup

clean up a bit

and some more
Mergen cleanup

Merge branch 'cleanup'