Refactor|GL: Cleanup