Remove useless files.. and improve the experience