merged
removed setup.php again