Cleaned up gss plugin