Finished cleanup

Removed all the old logging lines (or _Logger for server), and cut out
all the ###TEST markers as these are all verified to work now.