Worth removing the now commented out parts?