resolve parsing errors - too confident in commenting out old stuff