Removed unused var declaration
Cleanup police: using traits for GPM