Removed outcommendted redundant data