Cleaning up Train Kill

More