Tidy up compiler warnings
Remove bad SI DSL version