Dylan cleanup

I did some more cleanup.