clean up and 5.12.1 ready to release