Cleanup unused code
Cleanup unused code
Cleanup 'sleep' and platform specific code