clean up, we don't need a lamda deleter
move server forward declaration to single file