Removing server side unused stuff