More cleanup to include plugin
Fix some problems with movie-queue del and forget when deleting by movie id