Cleaned up the locomotive examples