pre-android cleanup, broken on darwin and win32
fixed git chaos