Cleaning +  fix viewport problem
cleaning