Removing unecessary stuffs