[TASK] Cleanup of paste behavior