Removed duplicate checks from changeling