Removed some extra variables in GM