Moved more methods to Gateway; cleaned up OmeroGateway