Cleaned up files and removed flightDataStep from get value functions