Cleanup of Parallel API Code & General Cleanup of Unused Code