Cleaned client and server sides