cleaned up server file