remove shell folder,and clean up code