removed remaining comments