Ugh. Further removal of commented out code.