Remove dependency on htaccess