Removing circular dependency and ensure all resources ARE cleaned up.

Signed-off-by: retep998 <retep998@verizon.net>