Cleaned up batch GTables code