Cleanup / final additions