gpm: rebuild, cleanup