Clean up the unecessary