Remove inner .gitignore
Fix some bad paritioning and remove testing-phase code...