Removed unused using directive.

Removed unused directives
Moved the Selector function call to the correct location and commented
on why the move was made.