Cleanup and proper raw frame -> full frame parsing