Can we remove the commented out parts here?