Commented out unwanted codes