Some cleaning up
Railtie problems