Work on StopPage and StopDelegate
More code cleanup