removed some garbage componants