Removed some GPI stuff wat