some cleanup
Strip is now engine independant