removed unused AMD imports and renamed to conform