Manager code cleanup