FIX use ruby 2 syntax, fix sapcing and remove some files