Client uses hardcoded value and some cleanup