Minor fixes, remove useless files