Removed some things that weren't supported.