Removed duplication of changes in StationFinder and stations