Removing unnecessary code in client crud