Can we remove the commented code out? Just being tidy