Parametrized controls.

Removed unused variable declarations.