Delete old stuff, commented code