Remove unnecessary dependency on Main