Remove non needed stuff and add some basis