Cleaned up unnecessary client code.