Cleaned up GDX stuff