Remove controls on the fly code has been added.
Add some code comments.