Some clean up on enchant addition