Moving Things Around.

Removing Context Listener since it is not used.