diff --git a/cuetag.sh b/cuetag.sh
deleted file mode 100755
index 9bc5c0e..0000000
--- a/cuetag.sh
+++ /dev/null
@@ -1,249 +0,0 @@
-#! /bin/bash
-
-# cuetag.sh - tag files based on cue/toc file information
-# uses cueprint output
-# usage: cuetag.sh <cuefile|tocfile> [file]...
-
-CUEPRINT=cueprint
-cue_file=""
-
-function check_required {
-	local err=
-	for var in ${@}; do
-		if eval "[[ -z \$$var ]]"; then
-			>&2 echo "CUETAG: Tag $var required but zero"
-			err=1
-		fi
-	done
-
-	if [[ -n $err ]]; then
-		exit 1
-	fi
-}
-
-# print usage instructions
-usage()
-{
-	echo "usage: cuetag.sh <cuefile|tocfile> [file]..."
-	echo
-	echo "cuetag.sh adds tags to files based on cue or toc information"
-	echo
-	echo "Supported formats (format extension, format name, tagging utility):"
-	echo "ogg, Ogg Vorbis, vorbiscomment"
-	echo "flac, FLAC, metaflac"
-	echo "mp3, MP3, mp3info"
-	echo "txt, Vorbis Comment Text File, tee"
-	echo
-	echo "cuetag.sh uses cueprint, which must be in your path"
-}
-
-# Vorbis Comments
-# for FLAC and Ogg Vorbis files
-vorbis()
-{
-	trackno=$1; shift
-	file="$1"; shift
-	fields="$@"
-
-	# FLAC tagging
-	#  --remove-all-tags overwrites existing comments
-	METAFLAC="metaflac --remove-all-tags --import-tags-from=-"
-
-	# Ogg Vorbis tagging
-	# -w overwrites existing comments
-	# -a appends to existing comments
-	VORBISCOMMENT="vorbiscomment -w -c -"
-
-	# VC text file format
-	# TODO: this also outputs to stdout
-	TXTFILE="tee"
-
-	case "$file" in
-	*.[Ff][Ll][Aa][Cc])
-		VORBISTAG=$METAFLAC
-		;;
-	*.[Oo][Gg][Gg])
-		VORBISTAG=$VORBISCOMMENT
-		;;
-	*.[Tt][Xx][Tt])
-		VORBISTAG=$TXTFILE
-		;;
-	esac
-
-	# space separated list of recommended standard field names
-	# see http://www.xiph.org/ogg/vorbis/doc/v-comment.html
-	# TRACKTOTAL is not in the Xiph recommendation, but is in common use
-
-	[ -n "$fields" ] ||
-	fields='TITLE VERSION ALBUM TRACKNUMBER TRACKTOTAL ARTIST PERFORMER COPYRIGHT LICENSE ORGANIZATION DESCRIPTION GENRE DATE LOCATION CONTACT ISRC'
-
-	# fields' corresponding cueprint conversion characters
-	# separate alternates with a space
-
-	TITLE='%t'
-	VERSION=''
-	ALBUM='%T'
-	TRACKNUMBER='%02n'
-	TRACKTOTAL='%02N'
-	ARTIST='%c %p'
-	PERFORMER='%p'
-	COPYRIGHT=''
-	LICENSE=''
-	ORGANIZATION=''
-	DESCRIPTION='%m'
-	# --------------------------------- my hack! ---------------------------------
-	#GENRE='%g'
-	#DATE=''
-	DATE=`sed -n 's!^REM DATE "\?\([^"]*\)"\?!\1!p' "$cue_file" | tr -d '[:space:]'`
-	GENRE=`sed -n 's!^REM GENRE "\?\([^"]*\)"\?!\1!p' "$cue_file" | tr -d '[:space:]'`
-	# --------------------------------- my hack! ---------------------------------
-	LOCATION=''
-	CONTACT=''
-	ISRC='%i %u'
-
-	check_required ARTIST DATE ALBUM TRACKNUMBER TITLE
-
-	(for field in $fields; do
-		 case "$field" in
-		 (*=*) echo "$field";;
-		 (*)
-			 value=""
-			 for conv in $(eval echo \$$field); do
-
-	# --------------------------------- my hack! ---------------------------------
-			case $field in
-				DATE)	value=$DATE
-					;;
-				GENRE)	value=$GENRE
-					;;
-				*)	value=$($CUEPRINT -n $trackno -t "$conv\n" "$cue_file")
-					;;
-			esac
-	# --------------------------------- my hack! ---------------------------------
-
-				 if [ -n "$value" ]; then
-					 echo "$field=$value"
-					 break
-				 fi
-			 done
-			 ;;
-		 esac
-	 done) | $VORBISTAG "$file"
-}
-
-id3()
-{
-	MP3TAG=$(which mid3v2) \
-		|| MP3TAG=$(which id3v2)
-	if [ -z "${MP3TAG}" ]; then
-		echo "error: not found '(m)id3v2'."
-		exit 1
-	fi
-
-	# space separated list of ID3 v1.1 tags
-	# see http://id3lib.sourceforge.net/id3/idev1.html
-
-	fields="TITLE ALBUM ARTIST YEAR COMMENT GENRE TRACKNUMBER"
-
-	# fields' corresponding cueprint conversion characters
-	# separate alternates with a space
-
-	TITLE='%t'
-	ALBUM='%T'
-	ARTIST='%p'
-	YEAR=''
-	COMMENT='%c'
-	GENRE='%g'
-	TRACKNUMBER='%n'
-
-	for field in $fields; do
-		case "$field" in
-		*=*) value="${field#*=}";;
-		*)
-			value=""
-			for conv in $(eval echo \$$field); do
-				value=$($CUEPRINT -n $1 -t "$conv\n" "$cue_file")
-
-				if [ -n "$value" ]; then
-					break
-				fi
-			done
-			;;
-		esac
-
-		if [ -n "$value" ]; then
-			case $field in
-			TITLE)
-				$MP3TAG -t "$value" "$2"
-				;;
-			ALBUM)
-				$MP3TAG -A "$value" "$2"
-				;;
-			ARTIST)
-				$MP3TAG -a "$value" "$2"
-				;;
-			YEAR)
-				$MP3TAG -y "$value" "$2"
-				;;
-			COMMENT)
-				$MP3TAG -c "$value" "$2"
-				;;
-			GENRE)
-				$MP3TAG -g "$value" "$2"
-				;;
-			TRACKNUMBER)
-				$MP3TAG -T "$value" "$2"
-				;;
-			esac
-		fi
-	done
-}
-
-main()
-{
-	if [ $# -lt 1 ]; then
-		usage
-		exit
-	fi
-
-	cue_file=$1
-	shift
-
-	ntrack=$(cueprint -d '%N' "$cue_file")
-	trackno=1
-
-	NUM_FILES=0 FIELDS=
-	for arg in "$@"; do
-		case "$arg" in
-		*.*) NUM_FILES=$(expr $NUM_FILES + 1);;
-		*) FIELDS="$FIELDS $arg";;
-		esac
-	done
-
-	if [ $NUM_FILES -ne $ntrack ]; then
-		echo "warning: number of files does not match number of tracks"
-	fi
-
-	for file in "$@"; do
-		case $file in
-		*.[Ff][Ll][Aa][Cc])
-			vorbis $trackno "$file" $FIELDS
-			;;
-		*.[Oo][Gg][Gg])
-			vorbis $trackno "$file" $FIELDS
-			;;
-		*.[Mm][Pp]3)
-			id3 $trackno "$file" $FIELDS
-			;;
-		*.[Tt][Xx][Tt])
-			vorbis $trackno "$file"
-			;;
-		*.*)
-			echo "$file: uknown file type"
-			;;
-		esac
-		trackno=$(($trackno + 1))
-	done
-}
-
-main "$@"
diff --git a/music_tagmove_lib b/music_tagmove_lib
index 243d41c..1581414 100644
--- a/music_tagmove_lib
+++ b/music_tagmove_lib
@@ -9,8 +9,6 @@ if [[ -z $FILE_FORMAT ]]; then
 	FILE_FORMAT='$track $title'
 fi
 
-cuetag=$(realpath ./cuetag.sh)
-
 global_errf=
 local_errf=
 
@@ -115,10 +113,13 @@ function cuesplit_single {
 	### Strip BOM
 	bbe -e 's/\xEF\xBB\xBF//' "$cue" -o ".bomstripped.cue" && mv ".bomstripped.cue" "$cue"
 
+	### Uncomment DATE
+	sed -i 's/REM DATE/DATE/g' "$cue"
+
 	if	cuebreakpoints "$cue" | shnsplit -o flac "$flac" || \
 		cuebreakpoints "$cue" | sed 's/$/0/' | shnsplit -o flac "$flac"; then
 		info "Tagging target \"$image_dir\""
-		if $cuetag "$cue" split-*.flac; then
+		if cuetag "$cue" split-*.flac; then
 			info "Renaming source files"
 			mv "$cue" "$cue.ignore"
 			mv "$flac" "$flac.ignore"