Removed some commetns