Integrate Arie comments
remove useless files