Remove unecessary stuffs