cleanup...
removing galaxys2 stuff and more cleanup...