useless files
merge from 2.php
minor changes