g-buffer cleanups