Remove commented out setup thats no longer needed