Cleaned up to work on PGC clusters