Removed unused management code