Cleanups
Remove auto-include of BasicServer