Removed commented out old codes.