removed dependency of instantiation sequence. more clean up required
removed dependency of instantiation sequence. more clean up required

runeh/dragonfly-stp-1,runeh/dragonfly-stp-1,runeh/dragonfly-stp-1