SWC-746 Clean up code for table parser