Removed GM, fixed build with removal