Removal of problematic dispatch code (for now) and change in target to 6.0 (likely just for testing)