need to remove a few more things to get server ok from scratch