Remove Awaken etc (thanks a..g) - unnecessary. Also add back RAPIER fix, but commented.