delete unused code
delete unused code
fix netcode for server (conflict with client)