Remove debugging echo/add multisite support