Server class unused code cleanup, remove of policy [cleanup]