Revert "some gpu cleanup work"

This reverts commit fabfa7224d943c602c45d5247669b1f5a55c4ca8.