Final changes before Singly removal