Removed postfixes for client