Clean up unused commented code