Cleanup on rail 3! #CSX #RVA