Simplify server creation
Cleanup