cleaned up server