Clean-up

Read commits for details.