subdomains now supported; cleanup