Updates, remove smf 1.1

Remove SMF 1.1, a few more small updates.