ENH: Remove old commented code and obsolete constants from the client.