Clean up unused methods and commented out sections of code