[PortalGun] Cleanup