Removed client stuff