remove profiling junk
fix tf and df update statements
move parser code back to main module