refactoring - no more server plans!