removed remaining old setup