Removing unsupported code. Tests now run (but don't pass)