Clean up gist imports.
Get rid of warnings and clean up imports.