Remove things made in wrong branch and corrections