Cleaning up server-side methods