Remove useless files + merge minor fixes