Remove some unecessary