Removed extension and added the client