Removed uneccesary commented parts