Fix selection tracking element on paste gets parsed out
Cleanup