todo cleanup for server create