Removed the commented and unwanted codes