Removed old gss stuf