Getting rid of some stuffs