code cleanup, removed unused server methods