checkiing in all
removing not in use