Cleanup, move stargate to single-object method