Removing unecessary parts