remap spi1/3 on F1. #74
remove blocks not required any more. #74