Synced with what is on Stratis

Also some clean up.